Fix buildroot problems and bring the buildroot image up

to 15feb06, update to Makefile.am. The original gcc-mirror patch is
removed and the buildroot configuration updated.

Signed-off-by: Woody Marvel <marvel@us.ibm.com>

diff --git a/tools/xm-test/ramdisk/Makefile.am b/tools/xm-test/ramdisk/Makefile.am
index 06cec439b796dd6564847e69336519a5968b7c0b..f578028129c736207efcf6f7cce13e38118936d4 100644 (file)
--- a/tools/xm-test/ramdisk/Makefile.am
+++ b/tools/xm-test/ramdisk/Makefile.am
@@ -1,7 +1,7 @@
 
 EXTRA_DIST = skel configs patches
 
-BR_TAR = buildroot-20050823.tar.bz2
+BR_TAR = buildroot-20060215.tar.bz2
 BR_URL = http://buildroot.uclibc.org/downloads/snapshots/$(BR_TAR)
 #BR_URL = http://buildroot.uclibc.org/downloads/snapshots/buildroot-snapshot.tar.bz2
 BR_SRC = buildroot

diff --git a/tools/xm-test/ramdisk/configs/buildroot b/tools/xm-test/ramdisk/configs/buildroot
index 64938194b25337eb39dafce1eaeb57631713bc1a..396b9ce260dc872748ab511bf067b4a3efd0fc22 100644 (file)
--- a/tools/xm-test/ramdisk/configs/buildroot
+++ b/tools/xm-test/ramdisk/configs/buildroot
@@ -2,6 +2,7 @@
 # Automatically generated make config: don't edit
 #
 BR2_HAVE_DOT_CONFIG=y
+# BR2_alpha is not set
 # BR2_arm is not set
 # BR2_armeb is not set
 # BR2_cris is not set
@@ -9,19 +10,30 @@ BR2_i386=y
 # BR2_m68k is not set
 # BR2_mips is not set
 # BR2_mipsel is not set
+# BR2_nios2 is not set
 # BR2_powerpc is not set
 # BR2_sh is not set
 # BR2_sparc is not set
+# BR2_x86_64 is not set
+BR2_x86_i386=y         
+# BR2_x86_i486 is not set
+# BR2_x86_i586 is not set
+# BR2_x86_i686 is not set
 BR2_ARCH="i386"
+BR2_ENDIAN="LITTLE"
 
 #
 # Build options
 #
 BR2_WGET="wget --passive-ftp"
 BR2_SVN="svn co"
-# BR2_TAR_VERBOSITY is not set
+BR2_TAR_OPTIONS=""
+BR2_DL_DIR="$(BASE_DIR)/dl"
 BR2_SOURCEFORGE_MIRROR="easynews"
 BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_TOPDIR_PREFIX=""
+BR2_TOPDIR_SUFFIX=""
+BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
 BR2_JLEVEL=1
 
 #
@@ -35,6 +47,7 @@ BR2_JLEVEL=1
 # BR2_KERNEL_HEADERS_2_4_27 is not set
 # BR2_KERNEL_HEADERS_2_4_29 is not set
 # BR2_KERNEL_HEADERS_2_4_31 is not set
+# BR2_KERNEL_HEADERS_2_6_9 is not set
 # BR2_KERNEL_HEADERS_2_6_11 is not set
 BR2_KERNEL_HEADERS_2_6_12=y
 BR2_DEFAULT_KERNEL_HEADERS="2.6.12"
@@ -44,6 +57,9 @@ BR2_DEFAULT_KERNEL_HEADERS="2.6.12"
 #
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
 # BR2_ENABLE_LOCALE is not set
+# BR2_PTHREADS_NONE is not set
+# BR2_PTHREADS is not set
+BR2_PTHREADS_OLD=y
 # BR2_PTHREADS_NATIVE is not set
 
 #
@@ -53,12 +69,12 @@ BR2_DEFAULT_KERNEL_HEADERS="2.6.12"
 # BR2_BINUTILS_VERSION_2_15 is not set
 # BR2_BINUTILS_VERSION_2_15_94_0_2_2 is not set
 # BR2_BINUTILS_VERSION_2_15_97 is not set
-# BR2_BINUTILS_VERSION_2_16 is not set
 BR2_BINUTILS_VERSION_2_16_1=y
 # BR2_BINUTILS_VERSION_2_16_90_0_3 is not set
-# BR2_BINUTILS_VERSION_2_16_91_0_1 is not set
-# BR2_BINUTILS_VERSION_2_16_91_0_2 is not set
 # BR2_BINUTILS_VERSION_2_16_91_0_3 is not set
+# BR2_BINUTILS_VERSION_2_16_91_0_4 is not set
+# BR2_BINUTILS_VERSION_2_16_91_0_5 is not set
+# BR2_BINUTILS_VERSION_2_16_91_0_6 is not set
 BR2_BINUTILS_VERSION="2.16.1"
 
 #
@@ -69,9 +85,12 @@ BR2_BINUTILS_VERSION="2.16.1"
 BR2_GCC_VERSION_3_4_2=y
 # BR2_GCC_VERSION_3_4_3 is not set
 # BR2_GCC_VERSION_3_4_4 is not set
+# BR2_GCC_VERSION_3_4_5 is not set
 # BR2_GCC_VERSION_4_0_0 is not set
 # BR2_GCC_VERSION_4_0_1 is not set
+# BR2_GCC_VERSION_4_0_2 is not set
 # BR2_GCC_VERSION_4_1_0 is not set
+# BR2_GCC_VERSION_4_2_0 is not set
 BR2_GCC_VERSION="3.4.2"
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
@@ -89,12 +108,17 @@ BR2_CCACHE=y
 # BR2_PACKAGE_GDB is not set
 # BR2_PACKAGE_GDB_SERVER is not set
 # BR2_PACKAGE_GDB_CLIENT is not set
-# BR2_PACKAGE_SSTRIP_TARGET is not set
-# BR2_PACKAGE_SSTRIP_HOST is not set
+
+#
+# elf2flt
+#
+# BR2_ELF2FLT is not set
 
 #
 # Common Toolchain Options
 #
+# BR2_PACKAGE_SSTRIP_TARGET is not set
+# BR2_PACKAGE_SSTRIP_HOST is not set
 BR2_ENABLE_MULTILIB=y
 BR2_LARGEFILE=y
 BR2_TARGET_OPTIMIZATION="-Os -pipe"
@@ -109,6 +133,7 @@ BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
 #
 BR2_PACKAGE_BUSYBOX=y
 # BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
+BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox.config"
 
 #
@@ -134,31 +159,41 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox.config"
 # Other stuff
 #
 # BR2_PACKAGE_ACPID is not set
+# BR2_PACKAGE_ASTERISK is not set
+# BR2_PACKAGE_AT is not set
 # BR2_PACKAGE_AUTOCONF is not set
 # BR2_PACKAGE_AUTOMAKE is not set
 # BR2_PACKAGE_BERKELEYDB is not set
+# BR2_PACKAGE_BIND is not set
 # BR2_PACKAGE_BISON is not set
 # BR2_PACKAGE_BOA is not set
 # BR2_PACKAGE_BRIDGE is not set
 # BR2_PACKAGE_CUSTOMIZE is not set
 # BR2_PACKAGE_ISC_DHCP is not set
+# BR2_PACKAGE_DIALOG is not set
 # BR2_PACKAGE_DIRECTFB is not set
 # BR2_PACKAGE_DISTCC is not set
 # BR2_PACKAGE_DM is not set
 # BR2_PACKAGE_DNSMASQ is not set
-# BR2_PACKAGE_DROPBEAR_SSHD is not set
+# BR2_PACKAGE_DROPBEAR is not set
+# BR2_PACKAGE_EXPAT is not set
 # BR2_PACKAGE_E2FSPROGS is not set
 # BR2_PACKAGE_FAKEROOT is not set
 # BR2_PACKAGE_FILE is not set
 # BR2_PACKAGE_FREETYPE is not set
 # BR2_PACKAGE_GETTEXT is not set
+# BR2_PACKAGE_LIBINTL is not set
 # BR2_PACKAGE_GZIP is not set
 # BR2_PACKAGE_HOSTAP is not set
 # BR2_PACKAGE_HOTPLUG is not set
+# BR2_PACKAGE_IOSTAT is not set
 # BR2_PACKAGE_IPROUTE2 is not set
+# BR2_PACKAGE_IPSEC_TOOLS is not set
 # BR2_PACKAGE_IPTABLES is not set
 # BR2_PACKAGE_JPEG is not set
 # BR2_PACKAGE_LESS is not set
+# BR2_PACKAGE_LIBCGI is not set
+# BR2_PACKAGE_LIBCGICC is not set
 # BR2_PACKAGE_LIBELF is not set
 # BR2_PACKAGE_LIBFLOAT is not set
 # BR2_PACKAGE_LIBGLIB12 is not set
@@ -167,12 +202,17 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox.config"
 # BR2_PACKAGE_LIBPNG is not set
 # BR2_PACKAGE_LIBSYSFS is not set
 # BR2_PACKAGE_LIBTOOL is not set
+# BR2_PACKAGE_LIBUSB is not set
+# BR2_PACKAGE_LIGHTTPD is not set
 # BR2_PACKAGE_LINKS is not set
 # BR2_PACKAGE_LRZSZ is not set
 # BR2_PACKAGE_LTP-TESTSUITE is not set
+# BR2_PACKAGE_LTT is not set
 # BR2_PACKAGE_LVM2 is not set
 # BR2_PACKAGE_LZO is not set
 # BR2_PACKAGE_M4 is not set
+# BR2_PACKAGE_MDADM is not set
+# BR2_PACKAGE_MEMTESTER is not set
 # BR2_PACKAGE_MICROCOM is not set
 # BR2_PACKAGE_MICROPERL is not set
 # BR2_PACKAGE_MICROWIN is not set
@@ -198,31 +238,42 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox.config"
 # BR2_PACKAGE_PORTMAP is not set
 # BR2_PACKAGE_PPPD is not set
 # BR2_PACKAGE_PROCPS is not set
+# BR2_PACKAGE_PSMISC is not set
 # BR2_PACKAGE_PYTHON is not set
+# BR2_PACKAGE_QTE is not set
+BR2_QTE_TMAKE_VERSION="1.13"
 # BR2_PACKAGE_RAIDTOOLS is not set
 # BR2_READLINE is not set
 # BR2_PACKAGE_RSYNC is not set
+# BR2_PACKAGE_RUBY is not set
 # BR2_PACKAGE_RXVT is not set
 # BR2_PACKAGE_SDL is not set
 # BR2_PACKAGE_SFDISK is not set
 # BR2_PACKAGE_SLANG is not set
+# BR2_PACKAGE_SMARTMONTOOLS is not set
 # BR2_PACKAGE_SOCAT is not set
 # BR2_PACKAGE_STRACE is not set
+# BR2_PACKAGE_SYSKLOGD is not set
+# BR2_PACKAGE_SYSVINIT is not set
 # BR2_PACKAGE_TCL is not set
 # BR2_PACKAGE_TCPDUMP is not set
 # BR2_PACKAGE_TFTPD is not set
+# BR2_PACKAGE_THTTPD is not set
 # BR2_PACKAGE_TINYLOGIN is not set
 # BR2_PACKAGE_TINYX is not set
 # BR2_PACKAGE_TN5250 is not set
 # BR2_PACKAGE_TTCP is not set
 # BR2_PACKAGE_UDEV is not set
 # BR2_PACKAGE_UDHCP is not set
+# BR2_PACKAGE_USBUTILS is not set
 # BR2_PACKAGE_UTIL-LINUX is not set
 # BR2_PACKAGE_VALGRIND is not set
 # BR2_PACKAGE_VTUN is not set
 # BR2_PACKAGE_WGET is not set
 # BR2_PACKAGE_WHICH is not set
+# BR2_PACKAGE_WIPE is not set
 # BR2_PACKAGE_WIRELESS_TOOLS is not set
+# BR2_PACKAGE_XFSPROGS is not set
 # BR2_PACKAGE_XORG is not set
 # BR2_PACKAGE_ZLIB is not set
 BR2_PACKAGE_HPING=y
@@ -230,7 +281,12 @@ BR2_PACKAGE_HPING=y
 #
 # Target Options
 #
+
+#
+# filesystem for target device
+#
 # BR2_TARGET_ROOTFS_CRAMFS is not set
+# BR2_TARGET_ROOTFS_CLOOP is not set
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_BLOCKS=0
 BR2_TARGET_ROOTFS_EXT2_INODES=0
@@ -242,6 +298,10 @@ BR2_TARGET_ROOTFS_EXT2_COPYTO=""
 # BR2_TARGET_ROOTFS_JFFS2 is not set
 # BR2_TARGET_ROOTFS_SQUASHFS is not set
 # BR2_TARGET_ROOTFS_TAR is not set
+
+#
+# bootloader for target device
+#
 # BR2_TARGET_GRUB is not set
 # BR2_TARGET_SYSLINUX is not set
 
@@ -249,6 +309,7 @@ BR2_TARGET_ROOTFS_EXT2_COPYTO=""
 # Board Support Options
 #
 # BR2_TARGET_SOEKRIS_NET4521 is not set
+# BR2_TARGET_SOEKRIS_NET4801 is not set
 # BR2_TARGET_VIA_EPIA_MII is not set
 
 #

diff --git a/tools/xm-test/ramdisk/patches/buildroot/gcc-mirror.patch b/tools/xm-test/ramdisk/patches/buildroot/gcc-mirror.patch
deleted file mode 100644 (file)
index 4db8847..0000000
--- a/tools/xm-test/ramdisk/patches/buildroot/gcc-mirror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- buildroot/toolchain/gcc/gcc-uclibc-3.x.mk~ 2006-01-15 17:41:18.000000000 -0500
-+++ buildroot/toolchain/gcc/gcc-uclibc-3.x.mk  2006-01-15 17:43:07.000000000 -0500
-@@ -20,8 +20,8 @@
- GCC_VERSION:=$(strip $(GCC_VERSION))
- 
- #GCC_SITE:=ftp://ftp.gnu.org/gnu/gcc/releases/gcc-$(GCC_VERSION)
--GCC_SITE:=http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(GCC_VERSION)
--
-+#GCC_SITE:=http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(GCC_VERSION)
-+GCC_SITE:=http://mirrors.usc.edu/pub/gnu/gcc/gcc-$(GCC_VERSION)
- #
- # snapshots....
- #GCC_VERSION:=3.3-20031013